merge trunk
authorKenichi Handa <handa@etlken>
Tue, 20 Apr 2010 04:24:33 +0000 (13:24 +0900)
committerKenichi Handa <handa@etlken>
Tue, 20 Apr 2010 04:24:33 +0000 (13:24 +0900)
commitfabbfd8d5c1a938d531a5a067f86764361702121
tree2314008358e6e9b2fcc9654aecec4393df394d3e
parent7891cde1222d7ddcd481b642057d7ed506991955
parent8e964cda6b5b34e224bbaae1745e55f605560ff1
merge trunk